Merge tag 'upstream/3.6.1_20161102'
authorGert Wollny <gw.fossdev@gmail.com>
Mon, 7 Nov 2016 11:41:00 +0000 (12:41 +0100)
committerGert Wollny <gw.fossdev@gmail.com>
Mon, 7 Nov 2016 11:41:00 +0000 (12:41 +0100)
commit74feeeadd7efa3809ab9d86ab6df8c7747692468
treed94dd3918517fce23adf96d99cf422e0d726134e
parent71a37f2510d989881fced9d90dbe1e332222d3b8
parente8ca983b14a7dd30759eed8e747f8993fcb53a60
Merge tag 'upstream/3.6.1_20161102'

Upstream version 3.6.1~20161102